From: Stefan Kangas <stefan@marxist.se>
Date: Sat, 26 Feb 2022 05:32:26 +0000 (+0100)
Subject: Merge from origin/emacs-28
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~16^2~2543
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c215158756b127f77a1cf298e80529e2589a23b4;p=emacs.git

Merge from origin/emacs-28

ded89ed3fa * lisp/net/tramp-sh.el (tramp-ssh-controlmaster-options): ...
---

c215158756b127f77a1cf298e80529e2589a23b4